Merge "Fix back button state issue"