Merge "Don't depend on mContentParent to determine if content was set."