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

            int fw = frame.width();

            int fh = frame.height();

            // First try reducing to fit in x dimension.

            scale = width/(float)fw;

            // Constrain thumbnail to smaller of screen width or height. Assumes aspect

            // of thumbnail is the same as the screen (in landscape) or square.

            if (dw <= dh) {

                scale = width / (float) fw; // portrait

            } else {

                scale = height / (float) fh; // landscape

            }

            // The screen shot will contain the entire screen.

            dw = (int)(dw*scale);