Merge "Allow touches to pass through screenshot shelf view" into main