Merge "Added activity with correct filter for DataSaver" into qt-dev