Merge "Remove Secure Startup option from Security Settings" into nyc-dev