Merge "Support4Demos: Handle ACTION_MEDIA_BUTTON intent properly"