Merge "[PORTAL] Fix portal-app startup arguments"