am 7c312c15: Move the all apps view back into the window with the workspace.

Merge commit '7c312c15e33b6cffbda707429e88ade498fc9f5e'

* commit '7c312c15e33b6cffbda707429e88ade498fc9f5e':
  Move the all apps view back into the window with the workspace.