Merge "Remove mTargetViewContainer safely" into sc-v2-dev