Merge change I174d16a3 into eclair

* changes:
  Debugging for #2027266: app drawer showing up on the side