Merge "Merge ActivityDisplay and DisplayContent into one class (77/n)"