Merge "Separate logic for publishing motion events"