Merge "Fix glitch with switching users from QuickSettings" into klp-dev