Merge "Fixed a bug where systemUI would crash when swiping notifications"