Merge changes from topic "am-a4912ede-7663-4592-a9fd-02d7d5e05de7" into ub-launcher3-master

* changes:
  [automerger] Track shelf rather than app window am: 7f300e3dff
  Track shelf rather than app window