Merge "Makes fake EffectsController injectable" into main