Story 805: Move Left Nav grouping to Stable

Also fix a bug in the process.

Bug: 51261
Change-Id: I19bc98fddee46d4e80546f200144fcc15522b278
Merge "Story 805: Move Left Nav grouping to Stable"