Merge "Fix crash with qc" into ics-mr0