Merge "Remove live/unused code from UIProvider contract class" into jb-ub-mail-ur10