Merge "Moved ActivityDisplay to its own class file."