Merge "composer: Fix HandlePluggableDisplays scope call" into display.lnx.9.0