Merge "Display blanking logic improvements"