Merge "[BugFix][Batterystats] bugfix for noteResetVideoLocked"