Merge "Use symmetric conditions for advertising and performing ACTION_SCROLL" into nyc-mr1-dev