Merge "Support forced Night Display auto mode"