Merge "SIM slot related interface changes"