Merge changes from topic "am-6771ef36-4102-4c19-8f2f-34291a759eef" into ub-launcher3-master

* changes:
  [automerger] Remove custom focus logic am: e598699dc5
  Remove custom focus logic