am f4d5afbc: Merge "Workaround for black sqaure issue caused by incorrectly recreated HW layer" into gb-ub-photos-denali

* commit 'f4d5afbcdc31165caef741aa7c06371b01c91b45':
  Workaround for black sqaure issue caused by incorrectly recreated HW layer