Initial commit with a PoC fix for focus losing issues.