Merge "Add has_search_button flag" into gingerbread