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

* commit '9ed99d65f7161bab0fbc277deb63579febafb093':