Merge remote-tracking branch 'origin/master' into develop

keyboards/drop/sense75/config.h

@@ -16,7 +16,6 @@
 #    define RGB_MATRIX_LED_COUNT (58 + 53)
 #    define ISSI_PWM_FREQUENCY 0b010 // 26k
 
-#    define RGB_DISABLE_TIMEOUT 0
 #    define RGB_DISABLE_WHEN_USB_SUSPENDED
 #    define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
 #    define RGB_MATRIX_KEYPRESSES

keyboards/dumbpad/v3x/config.h

@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Cleanup RGB
 #ifdef RGB_MATRIX_ENABLE
 
-#define RGB_DISABLE_TIMEOUT 300000 // 5 minutes (5 * 60 * 1000ms)
+#define RGB_MATRIX_TIMEOUT 300000 // 5 minutes (5 * 60 * 1000ms)
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 
 #define RGB_MATRIX_FRAMEBUFFER_EFFECTS // Heatmap, Rain