Merge "Cleaning up restore instance state logic" into ub-launcher3-master