Protect against crash on user switch
am: 6e6af2c7ee

Change-Id: Ife9ab7d026e242e229fb304cdd2d522e78a570dc