Merge "Fix NPE when updating gear vertical location" into nyc-dev