submarine fix controls for all screens
(cherry picked from commit 2e1cfc4894f5e3dec0669ae3b6d872453bab692c)