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

Change-Id: I5e0de9471f877035d4739eb7a9adada669ead538