Merge "Remove onWindowFocusChange solution from FPS enrollment" into udc-dev