Merge "Catch RejectedExecutionException for DisplayChanged from WM" into 24D1-dev