Merge "Disable setOutline() functionality, pending full removal"