GitLab

Also refactors control container height resource to match how we handle
the control container layout resource.

Change-Id: I1ea13d9adf54a01e18cbf9cb5721883a2d0fdab4
Reviewed-on: https://chromium-review.googlesource.com/c/1338330
Commit-Queue: Michael Thiessen <mthiesse@chromium.org>
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Reviewed-by: Matthew Jones <mdjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#608969}