am 1202c436: Merge "Secure windows, secure surface views and secure displays." into jb-mr1-dev

* commit '1202c43685c475158a773d03d70effa01b6bb4ff':
  Secure windows, secure surface views and secure displays.