Merge "Split MainActivity into two peers, old and new to keep logic isolated." am: 056c191113
am: fb7d6aa8f5

Change-Id: Ifaffd36389959870ee9621af205449f683332fec