Merge "Ensuring that we don't clobber workspace screens map when new apps are added." into jb-ub-gel-agar