Merge "SF: Start restructuring display creation" into rvc-dev am: d96f483057

Change-Id: I37ad6a1f4589adf17f97bc996fcf8abbdec0a87c