Merge "Turn on HDMI-related logs conditionally for better debugging" into nyc-dev