Merge "don't attempt to normalize the rotation vector" into gingerbread