am 7bf93cf5: Merge "Deferring zoom out animation until after snapToPage and...
am 7bf93cf5: Merge "Deferring zoom out animation until after snapToPage and animateDragViewToOriginalPosition." into jb-mr1-lockscreen-dev
* commit '7bf93cf5':
Deferring zoom out animation until after snapToPage and animateDragViewToOriginalPosition.