Merge "Fix comparison of SIM State values." into rvc-dev