Merge "Remove unreferenced assets in Settings Bug: 5032006"