Merge "Hide sim card selection UI when only one sim presents" into nyc-mr1-dev