Merge "Rename 'EMPTY' to 'SOLID_COLOR' for splash screen API changes." into tm-dev