Merge "Update caption handle menu to new spec." into tm-qpr-dev