Merge "Disable trimMemory(BACKGROUND) on lock with a Flag" into udc-dev