Merge "Apply diffs to screenshot action updates" into main