Merge "Clear/restore calling app identity prior to ui launch." into udc-dev