Merge "Refactor intra block prediction function"