Merge "SurfaceFlinger: fix isOpaque check in lockPageFlip"