am 2035fc54: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '2035fc54a53c541e00c1ca7357401950469fc458':
  Fix crash in Dialer in landscape mode