Merge "Correct assertNotifyMotionWasNotCalled check"