am 367921dd: (-s ours) Merge "Toast: fix force close if called from system service"

* commit '367921dd879cbc041852b121ce35b3c12803d853':
  Toast: fix force close if called from system service