Merge "Add developer option for screenshare protections" into main