Merge "Add VTS for setting layer white point"