Merge "Fixing Toast Hiding behind Taskbar - Part 2" into udc-dev