Merge "Fixes on handling messages from apps to host." into nyc-dev