Completed merge of subview_watchable_t