Merge "target: add support for disabling continuous-splash"