Merge "Move app_icon_content_size setting to generic dimens.xml" into ics-aah