am 823aaf0f: (-s ours) am c787bd66: am 6f09e99d: am 2bc9f407: Block overflow menu during setup. DO NOT MERGE * commit '823aaf0f': Block overflow menu during setup. DO NOT MERGE