Merge branch 'stable-3.3'

* stable-3.3:
  Stop propagation for all keys but exempt the save button

Change-Id: I57b4d93937458ce68a235d5867fd8fe5efdf92da