Fix #613

Take the preferred entrance animation from desktop until convergence guidance is given.
Merge pull request #620 from winjs/xirzec/fix613

Fix #613 - Take the preferred entrance animation from desktop until we converge