Merge "Fix missing color option on activity resume (1/2)" into udc-dev