Merge "Handle AppWarnings per-user per-display" into main