Merge "Waiting for Fallback Overview to stop after pressing Home" into main