Merge "Allow returned screenshot URI to be null" into 24D1-dev