Merge "Change preference title if Active Unlock enabled" into udc-dev