Merge "Update screenshot action system window dismiss fix" into main