Merge "Fix text is cut off in corner cut out condition" into pi-dev