Merge "Change screen pinning back to old gesture" into nyc-mr2-dev