Merge "Clean up msg queue implementation in RenderActivity" into lmp-dev