Merge "SurfaceFlinger: Select which layer state to visit" into oc-dev am: 3e0a85b997
am: 4f98f7a3b7

Change-Id: Ib6a403c330c0b7f436abf8f1355b99bfe7e42e60