Merge "Handle null result from getVirtualChildAt()" into mnc-dr1.5-dev