Merge changes from topic "am-b7d7bdf31f4e44279ba60dd9fd697495" into main

* changes:
  [automerger skipped] Merge "Catch RejectedExecutionException for DisplayChanged from WM" into 24D1-dev am: d12eb0fc0f -s ours
  [automerger skipped] Catch RejectedExecutionException for DisplayChanged from WM am: cc29392878 -s ours