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

Change-Id: Iaec86497dc19d0310d201458f5eca18e10bc0742