Merge "Add support for LS Clock to use > 1 Paint object"