Merge "avoid phone crash from exported activities" into nyc-mr1-dev