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