Merge "JPEG/R: add restriction to max_display_boost input from user" into udc-dev