Trebuchet : Add iconMask/iconBack/iconUpon/iconScale support

Change-Id: I85ecee3b5c26f79918fe0c4d220e09c943eec3e6
Merge "Trebuchet : Add iconMask/iconBack/iconUpon/iconScale support" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0