Merge "Revert "MediaSession: Add methods for setting shuffle and repeat modes"" into oc-dev