Merge "Fixed an issue where the statusbar wouldn't expand properly"