Merge "Battery saver dark mode bug" into rvc-dev