Merge changes Ifad4bd65,I6a4b7d69 into jb-mr1-dev

* changes:
  Turn off an assert.
  Fix crash in SystemUI.