Merge "Setting the alpha on the full bitmap for AdaptiveIcon instead of individual layers" into pi-dev