app: remove previous work around experiments, add one that fixes HomeScreen