Merge "Settings Cleanup and Reorganization" into kitkat3