trunk-tracking: update from r3677 to r3696.

Add inline unauthorized resources test and fix rendered image dimensions test.