Merge "Move screenshotting of the task earlier prior to the display change" into udc-dev