Merge "Don't scroll popup parent in response to parent scrolling"