Merge branch 'stable-3.4'

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

Change-Id: Ia8d0a88db7d8d438e2f744f4433f566714d01fcb