Merge "Update scrollIndicators XML enums to match View constants" into mnc-dev