Merge "Attempting to fix the black flicker" into pi-dev
am: b559512508

Change-Id: I95ee7346a8d2f10c07185d3c386a7ee778f6bd98