Merge "Fixed deadlock while mapping and unmapping process in AMS"