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

* commit '33c2ef37e7dc042dc4e886a24f48645a17d835d0':

Change-Id: Icc3612a5edcb2fc9973643e169b996c1268d560b