Merge "DO NOT MERGE: Don't take the AM lock in cached app compaction handler" into rvc-qpr-dev