Fix rotation based crashes.

App now functions as expected during multiple rotations

Change-Id: I64803a1ae27e33dbda92d4d881412958ae619d02