Merge "Really fix excessive 'trun' box parsing" into qt-qpr1-dev am: 01102840bc

Change-Id: I1e99a0717491cd91c57d1afe51fc9571e4d18442