Merge "DO NOT MERGE Clean up SettingsLib dependencies" into pi-dev