Merge "Check entire screen covered for all states during flicker transition" into main