Merge "Disable force-dark"