Merge "Force a garbage collection after lockscreen verification" into qt-qpr1-dev
am: a7b2bd71cd

Change-Id: I530775f0776935f7762eb413b7f0af341d94ee5e