Manifest and main activity import order changes