Merge "Fixing widget size cache loop end-boundary" into tm-qpr-dev