[automerger skipped] Merge "SF: Start restructuring display creation" into rvc-dev am: d96f4830 am: 983279db -s ours
am skip reason: Change-Id I8417682f4ead7b550a8973d4716c627e31b07b6e with SHA-1 aad4ebf3 is in history
Change-Id: Ia9f75d2bd909f2fee8bf1c06eb74cc9a9b0be0d5