am 51506326: Merge "Fix errors during user switching" into mnc-dev

* commit '51506326d1629ed6e1423c11ff2238c6f19b742f':
  Fix errors during user switching