Merge "Show privacy dialog on secondary user calls" into sc-qpr1-dev