Merge "DO NOT MERGE Revert "Revert "Clean up debug.sf.ignore_hwc_physical_display_or..."" into tm-qpr-dev