Merge "Keep changed focus data after service disable"