Merge "Refactor to remove GLOBAL_MOTION"