am f8e70f16: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'f8e70f16996388728522dd0663edc82030f599e6':
  Improve All Apps --> Workspace performance