Merge "Retrive the value of user-pref, if its not stored in persistentDataStore" into tm-qpr-dev