Merge "Revert "unfold: move everything into SysUIUnfoldComponent"" into main