GitLab

Hide the new shortcut layout behind a flag and re-add the old flexbox
layout.

Bug: 851335
Change-Id: Ic10b20f5a77874138cbd356aac98f55aa7109c06
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1606583
Commit-Queue: Kristi Park <kristipark@chromium.org>
Reviewed-by: Kyle Milka <kmilka@chromium.org>
Cr-Commit-Position: refs/heads/master@{#658827}