Organize BetaFeatures labs overrides cleanly

Put all BetaFeatures in one section.  No other changes.

Change-Id: Ice80910684947673d3d87476298e649c03c06933