Merge "Fix Settings app crash cause by BadParcelableException" into udc-dev