Improve PublicActivity compatibility implementation w/ 1.8.