Merge "Override policy fixed state on package uninstalled" into rvc-dev