Merge "Make disabled TextViews uneditable"