Bug 947101 - Rtsp: Backward seek fail. r=sworkman, a=1.3+
Bug 933264 - If we have to flatten scroll layer items make sure to clip their child items properly. r=roc, a=1.3+

The scroll layer item has the clip induced by the scroll frame, but the scrolled items are only clipped to the (larger) display port so we can async scroll the display port area. But if we can't merge all the scroll layer items then we can't render the expanded display port content so we have to clip the scrolled items to the scroll frame by propagating the clip on the scroll layer item to its children.
Bug 933264 - Reftest. a=1.3+
Bug 947931 - Remove unnecessary locking now to avoid potential for deadlock. r=botond, r=BenWa, a=1.3+