Merge "Update Display#getRealMetrics() behaviour" into nyc-dev