Merge "Revert "Read and cache features when user switches"" into rvc-qpr-dev