Merge "Add a failsafe to update surface position after activity-level transit" into udc-dev