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

Change-Id: I288eaa026b8a2e4c11e67a8e00a78b6dd60914b6