Merge commit 'f53c1865248dd2b38f8c24a0419d550330619b19' into eclair-plus-aosp * commit 'f53c1865248dd2b38f8c24a0419d550330619b19': Don't snap the initialScale to min or max if it is not defined.
Merge commit 'f53c1865248dd2b38f8c24a0419d550330619b19' into eclair-plus-aosp * commit 'f53c1865248dd2b38f8c24a0419d550330619b19': Don't snap the initialScale to min or max if it is not defined.