Remove app in case of debug keystore conflict
Merge remote-tracking branch 'origin/bugfixes' into bugfixes