Merge "Moving DatabaseHelper to it's own class outside of Launcher provider" into udc-dev