Merge "Fix potential NPE if there is no child in HorizontalScrollView"