SVE fixes (#32519)

diff --git a/examples/tv-app/android/java/MediaPlaybackManager.cpp b/examples/tv-app/android/java/MediaPlaybackManager.cpp
index 667ab2e..99afaaa 100644
--- a/examples/tv-app/android/java/MediaPlaybackManager.cpp
+++ b/examples/tv-app/android/java/MediaPlaybackManager.cpp
@@ -152,7 +152,7 @@
     }
     else
     {
-        err = aEncoder.EncodeNull();
+        return aEncoder.EncodeNull();
     }
 
 exit:
diff --git a/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/MediaPlaybackManagerStub.java b/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/MediaPlaybackManagerStub.java
index a6b9afc..e72d544 100755
--- a/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/MediaPlaybackManagerStub.java
+++ b/examples/tv-app/android/java/src/com/matter/tv/server/tvapp/MediaPlaybackManagerStub.java
@@ -35,11 +35,11 @@
   private static int playbackMaxForwardSpeed = 10;
   private static int playbackMaxRewindSpeed = -10;
 
-  private static MediaTrack activeAudioTrack = null;
   private static MediaTrack[] audioTracks = {
     new MediaTrack("activeAudioTrackId_0", "languageCode1", "displayName1"),
     new MediaTrack("activeAudioTrackId_1", "languageCode2", "displayName2")
   };
+  private static MediaTrack activeAudioTrack = audioTracks[0];
 
   private static MediaTrack activeTextTrack = null;
   private static MediaTrack[] textTracks = {