Merge "Fix a crash when setting vertical gear location and content view null" into nyc-dev