Merge "Add support for a custom left affordance icon"