Merge "Fix wired charging ripple not showing up in multi-user mode." into tm-qpr-dev