video ad load fixes
Merge branch 'adload' into dev
Merge branch 'release.2013-04-04.r1'