Merge "Fix NPE inside dispatchRestoreInstanceState" into sc-dev