Merge "Add WindowMetricsHelper" into rvc-dev