Merge "Fix to allow SYSTEM_UID to display windows." into jb-mr1-dev