Merge "Add APIs and implementation for additional caption edge types"