Merge "Remove unneeded callbacks to systemui."