am dd5814c4: Fixing crash on tablets from merging scheme changes.

* commit 'dd5814c471c316091f59febcffedb8d58d693492':
  Fixing crash on tablets from merging scheme changes.