Merge "native_app_glue: fix APP_CMD_TERM_WINDOW pre-hook"