Merge "Add ViewCompat.getDisplay" into nyc-mr1-dev