Merge "Introduce an entry point to provide an alternative DeficeEffectsAppplier" into main