Merge "Assets tab hidden by default" into v1.1