Merge commit 'cd0d9603c3e54b484ec5046538f336f57a3678bf' * commit 'cd0d9603c3e54b484ec5046538f336f57a3678bf': Prevent transparent region from getting out of sync with Surface Flinger
Merge commit 'cd0d9603c3e54b484ec5046538f336f57a3678bf' * commit 'cd0d9603c3e54b484ec5046538f336f57a3678bf': Prevent transparent region from getting out of sync with Surface Flinger