Merge "Ensure the selection does not change in setTextAndKeepSelection." into froyo