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

Change-Id: I4a74a24b436bfd8d160c147c50acb3c50ebe5d35