Merge "Prevent NPE in dispatchUserSwitch" into nyc-mr1-dev