Merge "Only allow for cyclic refresh (aq=3 mode) for base layer."

vp9/encoder/vp9_aq_cyclicrefresh.c

@@ -184,7 +184,8 @@ void vp9_cyclic_refresh_setup(VP9_COMP *const cpi) {
   // Don't apply refresh on key frame or enhancement layer frames.
   if (!apply_cyclic_refresh ||
       (cm->frame_type == KEY_FRAME) ||
-      (cpi->svc.temporal_layer_id > 0)) {
+      (cpi->svc.temporal_layer_id > 0) ||
+      (cpi->svc.spatial_layer_id > 0)) {
     // Set segmentation map to 0 and disable.
     vpx_memset(seg_map, 0, cm->mi_rows * cm->mi_cols);
     vp9_disable_segmentation(&cm->seg);