Merge "Revert "Combining the Thumbnail bitmap with the background to fix background spilling in the front."" into tm-dev