Merge "Modified behavior of mini-workspace screens"