Merge "Updating strings for activity interceptor dialog" into pi-dev