Merge "Actually apply after no sims change." into mnc-dr-dev