Merge "Clean up pixelatoms.proto" into sc-dev