Merge "Fixes theme choice on boot when scheme is not from latest wallpaper." into tm-qpr-dev