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

* commit 'bda36acf3e68ddec2dc9e0a73b057b2c647d6cb7':