Merge branch 'github/main' into main

Author: kokoro-team

PlayCoreKtx/features/picture/src/main/AndroidManifest.xml

@@ -19,6 +19,7 @@
     xmlns:dist="http://schemas.android.com/apk/distribution"
     package="com.google.android.samples.playcore.picture">
     <uses-feature android:name="android.hardware.camera" android:required="true" />
+
     <dist:module
         dist:onDemand="true"
         dist:title="@string/module_feature_picture">
@@ -28,12 +29,4 @@
         </dist:conditions>
     </dist:module>
 
-    <application>
-        <activity android:name="com.google.android.samples.dynamicfeatures.ondemand.PictureActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-            </intent-filter>
-        </activity>
-    </application>
-
 </manifest>

PlayCoreKtx/features/picture/src/main/res/layout/palette.xml

@@ -18,8 +18,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/content"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.google.android.samples.dynamicfeatures.ondemand.PictureActivity" >
+    android:layout_height="match_parent">
 
     <TextView
         android:id="@+id/title"