Merge "Move Dev Tools icon to mipmap"