Merge "Show filter menu on the right of SearchView when no menu button"