Merge "Merge "Fixed a crash when the heads up content view was null" into nyc-dev am: 841e4946bf am: edb61552b7" into nyc-mr1-dev-plus-aosp