Merge "Move Privacy dots to new DecorProvider"