Merge "Fix settings gear visibility" into sc-dev