Merge "Support for hollow switch and seek bar thumbs"