Merge "Fix panel height when only one notification is shown"