Merge "Fixed the default of AlphaOptimizedImageViews overlapping rendering" into nyc-dev