Merge "Make icon drawable for non-focused grid tasks smaller" into sc-v2-dev