Android: improve session restore + add user option checkbox.