display: fix "Use cache invalidate and clean correctly" merge

Change-Id: I6c6be68761d71f7bdaf613e1d883fa6f883ddb2b
Merge 'display: fix "Use cache invalidate and clean correctly" merge' into jb-mr1

Change-Id: I1bcc5d15b38e2509fb485f653e4e8075f6424954