Merge "All apps pull up work b/28917826 b/29469966 b/29542376" into ub-launcher3-calgary