Merge "Changed Animation API enums to uppercase." into devel/master