Bundling all changes done on the plane

@qinweigong 
For safety sake, can we change this to userId.equals(prefHelper_.getIdentity()), just in case prefHelper_.getIdentity() is null