Merge "Save per-user camera policy in different system properties"