Merge "Make sure SubsamplingScaleImageView respects minimum scale" into ub-launcher3-master