Merge "New OnBackEffect" into main