Merge "vendor/bliss: Include vendor/themes" into q10