Merge "Fix combobox metrics and asset scaling" into ics-mr1