Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Fix firing pending "..all.." events on startup

Change-Id: I38cc0318331479695af1eb34bcc8c3a45aec61aa