Merge commit '256fc04394431cbd332e56747fdbfda4cb4c2e25' * commit '256fc04394431cbd332e56747fdbfda4cb4c2e25': fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger
Merge commit '256fc04394431cbd332e56747fdbfda4cb4c2e25' * commit '256fc04394431cbd332e56747fdbfda4cb4c2e25': fix [2793164] Spam 2x/second with TOT master in SurfaceFlinger