Merge "Optionally trigger CG in onTrimMemory()" into qt-dev am: 71acb72cbd am: 0e9303f398
am: cc56909bfb

Change-Id: I2ee9dd13b9ca063b7a0a102300ad911af373f2ce