Merge "DrmStatus type checks"