Merge "Optionally trigger CG in onTrimMemory()" into qt-dev am: 71acb72cbd am: 5b80149cce
am: de9b336ce2

Change-Id: I8b190c123371ddc08b139b6c597e53cf69ff4fcf