Merging ub-launcher3-qt-r1-dev, build 5758528 am: 574d6c152c am: 41bc71de5a
am: 23177427f1

Change-Id: I9db4693ba113e984127ac45ee50142b19955751e