Merge "Ensure storage permission revoke happens for all users" into sc-dev