app: investigate and fix workaround marked "shit fix" in App.ts

In `packages/modules/app/src/app/App.ts` there's a `// TODO - shit fix` comment marking a known workaround that needs a proper fix. Investigate the surrounding code and replace the workaround with a proper solution.

Start by reading packages/modules/app/src/app/App.ts and the code surrounding the `// TODO - shit fix` comment. Trace the workaround's callers and current behavior, then identify the relevant tests or reproduction path. Done means the workaround is replaced with a proper solution and the existing behavior remains covered and passing.

Written by the indexing model from the issue text.