Merge "Clean up lint warnings in Resources"