Merge "Add progress bar for Privacy screen"