am 2cc95775: Merge "Fix possible crash in System UI" into klp-dev

* commit '2cc95775750ccd46f3192c05804c38dc04c5d2d6':
  Fix possible crash in System UI