Merge "Defer PSS collection while an activity is starting" into qt-dev