Merge "Add a failsafe check to prevent display surfaces from remaining hidden" into udc-dev