Merge "The canvas view defaults to SYNCHRONOUS_LOADING." into devel/master