Merge "Add null check for received intent." into sc-qpr1-dev