Merge "Fix an issue with default background" into tm-dev