Merge "Work around AM ContentObserver timing issue"