Merge "Cherry picking recents fixes to screen pinning and visibility."