am c3809a0f: am a224e801: am a8a0ac69: Merge "Do not access WindowManagerService#mCurrentUserId w/o lock." into mnc-dev

* commit 'c3809a0f391aa6b38853bee9bf9d0d9f5b3a5423':
  Do not access WindowManagerService#mCurrentUserId w/o lock.