Merge changes I32cbc333,I34926215

* changes:
  Fixing long compare.
  Cancelling window transition when starting focus animation.