Merge "Cleanup old sysprop flags for KeyboardBacklightController" into main