Merge "Fix issue #5187844: Query is misrouted to wrong content provider"