Merge "Add flag for displaying non-user's Windows to user." into jb-mr1-dev