Merge "Fix user switcher ripple emanation point" into mnc-dev