Merge "avsync: catch up to PCR if vpts is far behind it"