Revert "Bug 973443 - [settings] refactor Display panel with AMD pattern" for intermittent test failures

This reverts commit e1d028cb91ad1f05ddb6fcfff411369e21074280.