Merge "Zero out framenumber when clearing out layer" into rvc-dev