Merge "Split MainActivity into two peers, old and new to keep logic isolated."...
Merge "Split MainActivity into two peers, old and new to keep logic isolated." am: 056c1911 am: fb7d6aa8
am: 084a7bba
Change-Id: Iaec86497dc19d0310d201458f5eca18e10bc0742