Merge "Allow system_app to set properties"