Fix bug when returning from file picker without selecting a file
Fix back navigation in ViewfinderPage