Merge "Added VISIBLE_FOR_USER flag for policy visibility" into qt-dev