Merge "update_state: quiet const warning w/global-motion" into nextgenv2