am c787bd66: am 6f09e99d: am 2bc9f407: Block overflow menu during setup. DO NOT MERGE

* commit 'c787bd666330f872e2f3aff0d3f590724f95d574':
  Block overflow menu during setup. DO NOT MERGE