Views Box does not work from block admin

Due to issues with how blocks are triggered AJAX calls don't work from within the block admin. There is a patch for Boxes to work around this issue -- see http://drupal.org/node/1560114 for more details. In addition because of the slightly different form structures the views_boxes_view_id_callback function needs to check either $form['options'] or $form['settings']['options']. Attached is a patch to make that check. Again, in order to work correctly the patch for Boxes must also be applied.