Merge "Merging from ub-launcher3-master @ build 6304996" into rvc-dev am: c83758f223 am: cd41f278a6

Change-Id: Ic181e659b711829f07716f5fc6547b162d1b2541