am e625535d: Merge "Drawer loading failsafe" into jb-ub-mail-ur9

* commit 'e625535da3040e87900ac58614193f5e0f1112a0':
  Drawer loading failsafe