Merge "Fix forced portrait mode in ImportVCardActivity"