Merge "Add a parameter to the internal FGS notification listener" into tm-dev