Merge "Specify default activity policy" into tm-dev