Merge "View Renderer: remove emulator hack"