am 1b8cd52d: (-s ours) am bda36acf: (-s ours) am 10b79ba9: am 77ea9592: am 9ed99d65: am 2bc9f407: Block overflow menu during setup. DO NOT MERGE

* commit '1b8cd52d7f2160f73c1ca37e4883362f2bc7771d':