Merge "change screen pinning settings UI"