Merge "Trapping backspace at EditText level to prevent popping Docs." into nyc-mr1-dev