[automerger skipped] Merge "SF: Update display properties on hotplug connect"...
[automerger skipped] Merge "SF: Update display properties on hotplug connect" into rvc-dev am: ef94e1c1 am: 40a733b2 -s ours
am skip reason: Change-Id I89996d9340f6570fa5ae0cc0977eaba7a2d3693c with SHA-1 4a42d43b is in history
Change-Id: Ia0754d0938474f036ea1d1151d6174295556cd4e