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

Change-Id: I6af0f40c67d7364946ac4871b4a5eff786891e02