Merge "Add broadcast receiver for FGS manager dialog" into tm-dev