Merge "Properly restore RTL state in HorizontalScrollView" into mnc-dev