Merge "[wm]: Fixed layout problem in PolicyControl immersive mode"