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

Change-Id: Icec805c33ffbf833f070a5c6a1bb03f92d195ebc