Merge "Merge "Avoid fullscreen bounds check while exiting pip" into udc-dev am: 7f3ff219 am: e3f8616c"