Revert "Ajay/Melanie | #2964 | Skipping ft for this scenario till Monday for confirmation"

This reverts commit 94577f238243016a3608b4a9598b9a9e1b58354f.
Revert "Ajay/Melanie | #2964 | Bugfix - Hide device navigation for DS"

This reverts commit 2d14310b427b0b0e4a0f0f63bc2356736dbe009d.
Ajay/Melanie | #000 | Updated SkipUntil decorator