Merge "Fix SIM cards option displayed in RYU & N9 WiFi Settings" into nyc-dev