Merge "Fix crash when support item is clicked." into nyc-mr1-dev