Merge "Guarding against null pointer exception when setting view structure info for content capture" into sc-dev