Merge "Improve message for SIM cards not supporting data" into main