Merge "Move frame number to layer state"