Merge "Convert TestActivityDisplay.create to Builder"