Merge "Refresh DisplayContext to prevent getting stale DisplayMetrics" into sc-dev