Merge "Fix performance regressions with handheld apps panel." into main