Merge "On disabled app pairs, set color tint instead of changing alpha" into main