Merge "SurfaceFlinger: Select which layer state to visit" into oc-dev