Merge "Disallow turning off developer options in page-agnostic mode" into main