Merge "Fix crash when launching Activities in 'android' package" into lmp-dev