Merge changes from topic "am-a7f7fe17-3b82-49b1-b8b1-014e416b071e" into ub-launcher3-master

* changes:
  [automerger] Fixing crash on keyboard shortcuts popup am: 3455f8d0f6
  Fixing crash on keyboard shortcuts popup