Merge "CCodec: increase timeout for operations" into qt-dev am: a69eacc42c
am: f7463ea232

Change-Id: Id2e2ebe6f5368debd79394751619cb24c348d9b2