Merge "Stop setting Settings.Global.REQUIRE_PASSWORD_TO_DECRYPT"