Merge "Make brightness per-user in PersistentDataStore" into udc-qpr-dev