Merge "fix BootAnimation timing" into jb-dev