Cherrypick patch to reduce SystemUI crashes