Merge branch 'ub-launcher3-master' into launcher3merge

Bug: 113128349
Test: builds
Change-Id: I47253aee3fe7f15d1d633d046826c23320e9f78d