Merge "Fix recent SystemUI dump crash." into klp-dev