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

Change-Id: If60109cfeb9f5e059b0bf1963eadd7b2e2c8748c