Merge "Draw background color above display area..." into udc-dev