Merge "Do not lock headless system user 0 data"