Merge "unfold: move some dependencies into SysUIUnfoldComponent" into main