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

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

Change-Id: I75552b157f19b958d52e58ce00920623173d1fb2