Mergedevice-page-tabsintomain

This branch has no changes from main