Added save state for activity
Fixed merge