Merge branch 'stable-2.15' into stable-2.16 * stable-2.15: Fix issue with dropping events on start Change-Id: I8d1b52bcf8f8c288892492b4375178756c784ec3