Merge "Include SysUIUnfoldComponent only in phone SystemUI" into main