Merge "Re-enable transition animation between face unlock and backup" into jb-mr1-lockscreen-dev