Merge "Add overlay proxy type to ALL and REBIND_SAFE." into tm-qpr-dev