Merge "Remove unused custom shader prefix method" into devel/master