Merge "Introduce a grace period for bg activity starts" into qt-dev