Merge "Revoke prior uri grants when MediaProvider db gets recreated." into qt-dev