Merge "Fixes preview flash to black when navigating away" into udc-dev