Merge "Clean up: remove drawer from root settings layout"