Merge new SDK 2.0 compliant version of watchface.