Merge "Fix permission shell variables for host app" into main