Merge \"Prevent NPE in dispatchUserSwitch\" into nyc-mr1-dev
am: 340105677e

Change-Id: I73dc2ce8949b27bfc77634dc6be4dfbffc9ffa56