Merge "Use Eagerly instead of WhileSubscribed for shortcuts" into main