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

Change-Id: I23b360c3efb7186f028aef52722651e3daf2888a