Merge "Controls UI - Part 1 - Thumbnail support"