Merge "Fix hotseat flicker b/29648104" into ub-launcher3-calgary