am 4d5f1233: am 2632ca01: Merge "Ensuring disabled apps don\'t appear in workspace (issue: 5557311)" into ics-mr1

* commit '4d5f1233f009b77f48b09a869e0563cf713fdb30':
  Ensuring disabled apps don't appear in workspace (issue: 5557311)