7041bd2c42
* commit '3507708905e2d4aced05ece0d157ee9def40b624': Fix possible crash in System UI
* commit '3507708905e2d4aced05ece0d157ee9def40b624': Fix possible crash in System UI