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

keyboards/planck/keymaps/oryx/keymap.c

@@ -91,7 +91,7 @@ void set_layer_color(int layer) {
 }
 
 void rgb_matrix_indicators_user(void) {
-    if (g_suspend_state || keyboard_config.disable_layer_led) {
+    if (keyboard_config.disable_layer_led) {
         return;
     }
     switch (biton32(layer_state)) {

keyboards/planck/keymaps/oryx/rules.mk

@@ -3,5 +3,7 @@
 CONSOLE_ENABLE = no
 COMMAND_ENABLE = no
 MOUSEKEY_ENABLE = no
+RGBLIGHT_ENABLE = no
+RGB_MATRIX_ENABLE = yes
 WEBUSB_ENABLE = yes
 ORYX_ENABLE = yes