Merge branch 'stable-3.8' into stable-3.10 * stable-3.8: synchronizePendingEvents: Fix stuck replaying flag Release-Notes: skip Change-Id: I277e4bbfefee4895615976d1b26440d55a1eef58