Merge "Back region to lang selection: preserve search & position" into nyc-dev