Merge "Ensure QS tile secondary text marquees." into pi-dev
am: 2cb02549dd

Change-Id: Id656bad12b4cee728b649013825fc6cfa9af3fd5