Merge "Prevent height adjustment of TextLabel" into devel/master