Merge "Fix NPE when onStopUser."