Merge "MediaSession2: Fix bug in MediaSession2.setCustomLayout()"