am 0b157cc6: (-s ours) am 7aedc8a0: Automaticaly snap back to the previous mode from sliding input (DO NOT MERGE)

* commit '0b157cc66f6ea9b7a638c425111dc5ae0f6d9709':
  Automaticaly snap back to the previous mode from sliding input (DO NOT MERGE)