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

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