Merge "Update scaleType to fitCenter"