Merge "Exit boot animation cleanly." into jb-dev