Merge "Delete unused layout." into nyc-andromeda-dev