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

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