Merge "Replace getResourceId default 0 with Resources.ID_NULL" into sc-dev