Merge "Update oom score reference state if activity state is changed"