Merge "Make buttons react to tap" into rvc-dev