Merge "Change updatable drawable IDs to strings"