Check for null extras before accessing previous screen extra
am: 1bb6c29

* commit '1bb6c29245bbef5b8dd1c68607acf14aec639be6':
  Check for null extras before accessing previous screen extra