Merge "DO NOT MERGE - Add test of fg service notification policy" into qt-qpr1-dev