Merge "Fix adaptive auto brightness bugs"