Merge "Finish activity when created by documents provider and documents provider gone." into rvc-dev am: c460947724

Change-Id: I2ed5d2aa3643e3d1e4aa951b3e561ff41c79d910