[automerger skipped] Merge "Defer PSS collection while an activity is starting" into qt-dev am: 94f0c20ee9 am: 8335a75238 -s ours
am: 7ab6041377 -s ours
am skip reason: change_id Icf5cf2e3dde0bd5fd3ab9c4a85adfb1f3382057f with SHA1 fa778eb014 is in history

Change-Id: I65b1c8c8f93c80536713b6d49e3c7638ae9bd1a2