Move testExternalStorage into MainActivityLogic
Merge remote-tracking branch 'github/test-screen-shot' into test-screen-shot