Merge "display: Remove genlock usage"