Merge "Fix possible crash in System UI" into klp-dev