Merge "Fix 3272584: home button should return to previous workspace"