Merge "Fix issue where workspace was not shown after screen off/on"