Merge "SurfaceFlinger: Add a test to ensure buffer takes priority over blur"