Merge changes I45b6f858,I28120248 into udc-qpr-dev

* changes:
  Verifying that ViewCapture data is not empty
  Restoring starting capturing existing activity.