Merge "Update WatchFace project to remove old watch faces that are no longer good practice and change structure to make sample clearer." into nyc-mr1-dev