Merge "Calculate a new height when full relayout needed" into devel/master