Merge "Fix WRITE_SECURE_SETTINGS permission issue"