Merge "Remove shader based gamma approach"