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

* commit 'b892ac680b045daca2926037955857889d32e1c0':
  Fix glitch with switching users from QuickSettings