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

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