am 18bbc6a0: Adding workaround for issue with null drawable

* commit '18bbc6a013e10b1fe384b7d3798622e087c813d2':
  Adding workaround for issue with null drawable