Merge "Fix crash on user switch"