Merge "Remove MediaFocusControl persisting media button receiver" into lmp-dev