Merge "Protect against crash on user switch" into nyc-mr1-dev