Merge commit '7e1f5a2d' into gingerbread-plus-aosp

* commit '7e1f5a2d':
  Make sure to set symbol keyboard shifted