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

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