Merge "SF: Refactor processDisplayChangesLocked()" into rvc-dev