Merge "SF: Extract virtual display allocation from CE"