Merge "Replace details dialog with expando subheader"