Merge "Defer PSS collection while an activity is starting" into qt-dev
am: 94f0c20ee9

Change-Id: I2d441120282e068a2a8a03151867703032fb0bbc