Merge "Make sure mParent is not null before using it" into sc-v2-dev