Merge "Fix 4689527: Fix rendering issue with thumbnails on phones"