Move some overlays in from xt897

Change-Id: I475a4cde080968a0acad0cf20337019b03e66f82
Merge branch 'cm-11.0' into martincz