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

Change-Id: I3abe8d58ef7612d0b173f1a6fb1e437a6e437713