Merge "PIN Views - Make a bit smaller for better reachability" into sc-dev