Check for null extras before accessing previous screen extra

Bug 27389760
Bug 27341012
Bug 18388581

Change-Id: Ic1b4a98aa3d94c2fa29e25e9d3067affeee0cf21
4 files changed