Merge "Hide subtitle for dialog from QS when applicable" into oc-mr1-dev am: 70b438cadf
am: 2a09f526d3

Change-Id: I251797206161c0170656f65ec8432cdf149c9793