Merge "Fix HDR layer info listener to use the right area" into sc-dev