Merge "Prevent HTML Injection on the Device Admin request screen" into sc-dev