Merge "Add support for handling odd dimensions" into qt-qpr1-dev am: c414acd144

Change-Id: I07e59a6c282e6b92f2916c6026a9610c6ed1ca17