Merge "Implement extra persistence layer for widget provider info" into tm-dev