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

* commit 'd5bda747971db5fc2dde78dcc5bb42e62659667d':
  Fix possible crash in System UI