Merge "Make a couple of constants in MediaSessionService configurable." into sc-dev