Merge "Fix volume adjustment for foreground media apps without media session" into main