Merge "Clear ViewGroup nested scrolling axes when nested scrolling stops"