Merge pull request code-dot-org#15054 from code-dot-org/helper-instan…

…ce-var-cleanup

Avoid instance vars, setting state in `LevelsHelper#get_channel_for`

Merge pull request code-dot-org#15084 from code-dot-org/temporary-stu…

…dio-fix

Studio homepage: temporary fix for error while we diagnose fully

Merge pull request code-dot-org#15078 from larrypo/resize_empty_locke…

…d_label_bug

When a label has no text, don't resize to 15x15 if either width or height is locked.

Updated apps strings

Merge pull request code-dot-org#15011 from code-dot-org/manifestIsUnc…

…hanged

Simplify logic surrounding manifest_is_unchanged.

Merge pull request code-dot-org#14980 from code-dot-org/pcardune-code…

…gen-move-custom-marshal-object-list

Move codegen.customMarshalObjectList to JSInterpreter instance (plus refactor)

Merge pull request code-dot-org#14964 from code-dot-org/csd_u4-6_cate…

…gories

Add categories for CSD units 4-6

Merge pull request code-dot-org#14910 from code-dot-org/unitOverview

Unit overview bugs

Updated apps strings

Merge pull request code-dot-org#14866 from code-dot-org/school-info-i…

…nterstitial-go-live

Flip school info interstitial live