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

Change-Id: I7a3c6a8ac1e7d5da17aabec29739f46da9013a03