Merge "Revert "Revert "Adding the missing display mode strings to persistentDataStore""" into tm-qpr-dev