Merge "Also apply freeze-task-list when starting an activity" into qt-r1-dev
am: 2cc5346954

Change-Id: Id062df0c41accbf95a48f78b14e3d4512605d7f4