Merge "added setDisplayId in GestureDesicption.Builder to support multi-display"