Merge "Only update the cached state if the value changed" into tm-qpr-dev