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

Change-Id: If5362d5f87028f8966040351476f558334fb852c