Merge "Add accessors for switch thumb and track tinting"