Merge "Fix Toast dimensions on non-default displays" into main