Merge "Fix rendering issue in Tegra2/3."