Revert "Add advanced device settings under more if available"

This reverts commit 5fe3897a3903e1e4cf7a44a52320021210fe0d6e.
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0