Merge "Add/refine comments to reflect key event policies" into jb-dev