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

* commit '77ea9592b60e09fedd6c2e8b03bd12afff55ee07':