Merge "31592: "The <activity> xxx is not registered in the manifest""