Merge "Add developer option for device identifier restrictions"