Merge "Fix crash if show system is selected too soon" into mnc-dev