am 2484e70c: Merge "Make All Apps<-->Workspace transition smoother"

* commit '2484e70c0b9bceb96e8df349173aa3bddd17ccc2':
  Make All Apps<-->Workspace transition smoother