Merge "Add default on/off strings to SwitchCompat" into mnc-ub-dev