Merge "Don't scroll popup parent in response to parent scrolling" into nyc-mr2-dev
am: 41023417e7

Change-Id: I4e42386e1f227e2cb48bf37eb05bcf7f81b6d709