Merge "Fixed an issue where the panel height was wrong"