Squash revert of Re-add system settings fragments direct link

Change-Id: I5a6d5584460e4b3eb7375b9072c8ea6f5032040e