Handle activity resume from file picker properly
Merge branch 'master' into plugin_with_arm_binary