Fix back button handling
Merge branch 'master' into plugin_with_arm_binary