Send allow_screen_content flag for both key and intra only frames

BUG=webm:1311

Change-Id: I03c1043d17ed4e4ea22002473779a9612884c6c6
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 6774bb2..7ac0f1e 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -3198,11 +3198,10 @@
     write_sync_code(wb);
     write_bitdepth_colorspace_sampling(cm, wb);
     write_frame_size(cm, wb);
-    if (frame_is_intra_only(cm))
-      aom_wb_write_bit(wb, cm->allow_screen_content_tools);
+    aom_wb_write_bit(wb, cm->allow_screen_content_tools);
   } else {
     if (!cm->show_frame) aom_wb_write_bit(wb, cm->intra_only);
-
+    if (cm->intra_only) aom_wb_write_bit(wb, cm->allow_screen_content_tools);
     if (!cm->error_resilient_mode) {
       if (cm->intra_only) {
         aom_wb_write_bit(wb,