Merge changes from topic 'am-8fe17af0-0537-403b-a1b4-6a352a5e7ce7' into ub-launcher3-master

* changes:
  Collapse caret click and all apps click into one am: bf78f3cd41 am: 49b420f7c4
  Collapse caret click and all apps click into one am: bf78f3cd41
  Collapse caret click and all apps click into one