Merge "Allow updating enterprise drawables in settingsLib"