Merge "Fix QS switch accessibility problem" into mnc-dev