Merge "increase timeout of H263QcifLong to 11mins" into jb-mr1-dev