Fix multiple performance regressions

Measured performance with test
TemporaryMediaNotificationTestMicrobenchmark#expandShade_mediaIsShowing,
metric perfetto_ft_surfaceflinger-missed_frames-mean. Regressed value
was ~108, baseline after fix is ~4.4.

Fix: 378596436
Flag: EXEMPT bugfix
Test: manually verified wallpaper save/load with both flag states
Test: locally verified metric returned to baseline
Change-Id: Ic3bf090364a7b8ae675327d6257fef15232190b4