Merge "Add new/changed drawable assets from design team" into gingerbread