Merge "Simplify/correct Taskbar insetsRoundedCornerFrame calculation" into udc-dev