Workaround for black sqaure issue caused by incorrectly recreated HW layer

Bug: 12594617
Change-Id: I9209d4bc0d6ebd045b957b3c79eabdca0a4f7cc4
4 files changed