Merge "Fix insider attack resistance on headless devices"