Merge "Allow returned screenshot URI to be null" into main