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

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

Change-Id: I76cf7c26856dafbd2ff036a1053a8bd294e348f5