Merge "Fix issue where brightness mirror listener wouldn't be released"