Merge "Fix SpaActivity launched twice for App Info" into udc-dev