Merge "unfold: move everything into SysUIUnfoldComponent" into main