Fixing CCT App Menu issues introduced by refactor

This CL undoes some of the changes that could impact CCT that was
introduced in the MenuButton refactor CL:

Bug: 925271
Change-Id: Ifb9575f8cf52934981c12b1a6c5114993997cc5e
Reviewed-by: Theresa <>
Commit-Queue: Theresa <>
Cr-Original-Commit-Position: refs/heads/master@{#628296}(cherry picked from commit a5003b9dbef6d18097a3e8d6067c73af92f606d5)
Reviewed-by: Pedro Amaral <>
Cr-Commit-Position: refs/branch-heads/3683@{#167}
Cr-Branched-From: e51029943e0a38dd794b73caaf6373d5496ae783-refs/heads/master@{#625896}
3 files changed