Merge "Update the preferred size after relayoutting" into devel/master