Merge "Overflow activity scaffold, xml, manifest, style"