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

Change-Id: Ic0db7139716eb45178fef4a44d5da77216306a06