Merge changes from topic 'am-103e12ab-e4f5-4f1e-a8f6-6b164b13e8de' into ub-launcher3-master

* changes:
  Merge commit '18c4aa458ea5c9ee5513fa756da4f5492bb7c5b8' into am-103e12ab-e4f5-4f1e-a8f6-6b164b13e8de
  Update accessibility for popup
  Update accessibility for popup