Merge "Do not animate unfolded bar when folded on certain SysUI flag update" into main