Merge "Allow extra pixel for app bounds containment PiP" into main