Merge "Fix UnsupportedOperationException in Display Settings" into sc-dev