Fix loss of state when opening app via launcher