Merge "Change screen pinning back to old gesture" into nyc-mr2-dev
am: 8812fb0695

Change-Id: I4a5ccf55bf02ba25d4ce652ac86cdba20814d661