Merge "Don't use deprecated NS_IMAGE*"