Merge "Controls UI - Tap for NO_TEMPLATE" into rvc-dev