Themes: Set bounds on iconUpon

Change-Id: I90720b87ed6d5c30f342bd0e1c149e8a6e238d6e
Merge "Themes: Set bounds on iconUpon" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0