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

* commit 'd2382b7e89a81c79ab60578ef78f3faff1eecf44':

Change-Id: Ib084b9d1841806e8bdca4cd9995f0c6f3cd40759