Merge "Fix a crash when setting vertical gear location and content view null" into nyc-dev am: 6e3a90d
am: 06318d3

* commit '06318d37ba522fde3bb1f34df6e5e4fe97359cd9':
  Fix a crash when setting vertical gear location and content view null

Change-Id: I85b2ec11b50aa18c27333de53d617f9376172af0