90faa282f1
Merging to ub-launcher3-master manually as automerger failed. Tested: Manual Change-Id: I1b8b43de7f04e1e13cb283c88f95a7c6fea84ea6