Merge " Hide "clear" action for empty search query." into mnc-dev