Bug 934908 - Manage activity chaining for homescreen correctly