Merge "Don't use trimMemory(BACKGROUND) for lockscreen trimming." into udc-dev