Merge "Fix keyguard and qs user switcher disabled state" into rvc-dev