Merge "Override fade animation on brightness exit"