Merge "AM: refactor LockTask whitelist update logic."