Merge "Fixed a measuring bug when the panel was collapsed" into mnc-dev