Include cleanup merge and make app work in emulator for screenshots