Merge "Update header to have content intent & settings buttons"