Merge "Prevent SysUI from crashing during Ghost animation" into sc-dev