Merge "Add WindowMetricsHelper" into rvc-dev am: 5681f3e796

Change-Id: Ic4d54316e06b545d7a0467f412c89bd776ea7e89