Merge "First pass at drawer support for SettingsLib"