Merge \"All apps pull up work b/28917826 b/29469966 b/29542376\" into ub-launcher3-calgary
am: 4efaed5637

Change-Id: Ifbcd35ab86247afb484f95275fff587fc403a42b