Merge "Fix testTrimQuietProfileTasks"