Merge "Clear check mark resource ID when set from Drawable object"