Merging  ub-launcher3-master, build 5412858
Test: Manual

Bug: 111926330
Bug: 125362112
Bug: 127366543
Bug: 128531133
Bug: 129270535
Bug: 129297366
Bug: 129421279

Change-Id: Ib4059b7a14106b1859a3d8d6c7c4ef253f29ed7a