Merge "Revert "Adjust text fit condition"" into devel/master