Merge changes from topic "a11y-minus-one" into ub-launcher3-qt-future-dev
am: ff4977d42d

Change-Id: I5c565a2d67274240dcd06e41ad03564526d486ce