Merge "Fix narrow statusbar when folding" into sc-v2-dev