Frameworks: fix merge issue and make battery light multiuser configurable