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

Change-Id: Iddda5d785c1dd2d128d2972525d03451a27c3edc