Merge "Fix navbar clipping" into sc-dev