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

Change-Id: I3aca61ae94a6d37d3e19bfcc13d12ea2d1c9b130