Adding inMobileViewer and inDesktopViewer attributes for both layer and theme. Fixing tests.