Merge "Correct check box visibility in Display / Brightness"