Ajay/Melanie | #2964 | Bugfix - Hide device navigation for DS