Merge "Update layers' opaque property when needed"