Merge "Catch RejectedExecutionException for DisplayChanged from WM" into main