Merge "Fix crash when tapping on cell icon in QS." into nyc-mr1-dev