Merge "Better support for fake timestamps in RTP, H.263 video now also requests FIR." into gingerbread