Merge commit '6347c322b36cdf6a30a35e80d205d00d40368e61' * commit '6347c322b36cdf6a30a35e80d205d00d40368e61': Density Compatibility mode for SurfaceView
Merge commit '6347c322b36cdf6a30a35e80d205d00d40368e61' * commit '6347c322b36cdf6a30a35e80d205d00d40368e61': Density Compatibility mode for SurfaceView