Merge "Update Icon layout file." into tizen_2.1