Merge "Fix search back behavior."