Collapse caret click and all apps click into one

-> Was separating them for cleanliness, but turns out
   in portrait the caret is the button, but in landscape it's not.
   We'll clean all this up later.

Change-Id: Icbc185f9183ded685b4a988eacf19cb7583ed8ad