Merge "DisplayManagerService: use per-pid freezer listener" into main