Update Uilib and sample app with consent UI - amends after code review