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