Merge "Revert "Reset SIM state if the subscription is no longer active."" into pi-dev