Merge "Restores implementation of isPresenterLocked()."