Merge "SF: Refactor processDisplayChangesLocked()" into rvc-dev am: ef4d31e2d7 am: 906da4a1e3

Change-Id: Ibca893f5b0784ee02fa1885c89e3446fa8a153cb