Merge "Change getString/Drawable APIs to accept null default values"