Merge "Use TEXT_HANDLE_MOVE in TextView behind the flag"