Merge "Add EXTRA_LOCAL_ROLE to Pan State change intent."