Merge "Port active map / cyclic refresh fixes to vp10."