Merge "Improve handling of hwcomposer with unsupported present fences"