Merge "Fix visual defect when BorderlineOffset = 1.0f" into devel/master