Merge "Revert "Adjust default app op behavior based on feature state""