Merge "Don't wait until boot timeout if there is no wallpaper." into jb-dev