Merge "Fix race in media button intent registration" into jb-mr2-dev