Merge "Fix NullPointerException issue when user change"