Merge "Don't tell expanded controller about gestures unless we are expanded." into rvc-dev