Merge "Update activity recognition permission naming"