Merge "Disable memory trimming on AoD and on unlock" into udc-qpr-dev