Merge "Don't override action in UI and REDIRECT responses"