Merging from ub-launcher3-master @ build 6356169 am: df83c9026d am: d503307722 am: 05201fb66c

Change-Id: If2be1ad14c93d5439cd7ef8774cef74f2e41ad02