Merge changes from topic "am-01ff3d34-0eea-44d5-99f7-af2df518afb2" into ub-launcher3-master

* changes:
  [automerger] Fix bug where labels were visible in hotseat / invisible in workspace. am: f1eae802b5
  Fix bug where labels were visible in hotseat / invisible in workspace.