Merge "PIN unlock buttons - contrast issue" into sc-dev