Merge "Delay start of mediaswcodec until after APEX is mounted"