Merge "Improve picture capture debug path" into sc-dev