Merge "Multi-crop: refactors adding recents for better code reuse" into main