Merge branch 'ub-launcher3-dorval' into launcher3merge am: 7e0801eafb am: 52c656d77c
am: df9c1a9990

Change-Id: I49b5cbbfb8c3fce5642c67e59e36bb90f99429c0