Merge \"Fix hotseat flicker b/29648104\" into ub-launcher3-calgary
am: b1e9e8d662

Change-Id: Id1b6df9958afe496f8dd224de61332df03466d9f