Fix for always destroyable activities
Update build.gradle
Update activity names
Update build tools version
Merge remote-tracking branch 'origin/master'