Merge branch 'ub-launcher3-dorval-polish2'
am: ea6d0e631e

Change-Id: Iad151c917d51a5d90f7f3baddc76974fc44ee4ff