Merge "Revert "Make keyboard backlight indicator more accessible"" into main