Fix back to splash bug
Merge branch 'fix/back-to-splash' into dev