Adding missing activity references in manifest because of some weird merge