merging the Privacy Panel to dev_apps with fixes