Merge "[SM10] Adopt helper class to monitor RAT type change per sub"