Merge branch 'ub-launcher3-dorval-polish2'
am: 850a7b1030

Change-Id: Iefff638054d7916b8f87e8e9451677a8c650b43e