Merge "Deprecate ActivityRecord#mLastKnownParent" into sc-dev