Merge "More UX polish in WPP quick switch section." into tm-qpr-dev