Merge "Revert^2 "[Media] Update background gradient scrim to use album theme colors."" into tm-dev