Merge "ActionBar SearchView's default hint shouldn't override SearchableInfo" into mnc-dev