Merging from ub-launcher3-master @ build 6369897 am: 884f8f217f am: 23f879c314

Change-Id: I7bd90d7ad6d950dfb5b73e066deff2c4e3c92027