Merge "Zero out framenumber when clearing out layer" into rvc-dev am: 0705399bf0

Change-Id: I2d503eafa643539bf99855f2eaded925022919f2