Merge "sysui: refactor out PanelHolder"