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