Merged master branch changes into dev (forgot to setup dev branch before
starting changes)
Revamped base dialog implementation to have a more sensible approach
that works correctly with dialog or embedded display
Merge branch 'dev'
Merged dev into master (brings base dialog changes)