Merge "Merge "QS custom tiles - better handling of invalid icons" into nyc-dev am: e6be9c58 am: 11939b15" into nyc-mr1-dev-plus-aosp