Merge "Fix crash in onRestoreInstanceState"