Merge "Fix flickering when switching display power modes" into pi-dev am: 5e0957aaed
am: 85178a5604

Change-Id: I5fa659068aebeee06988ea699dbd0d5be18a2bdc