Merge "Adjustments for sample config watch face activity." into lmp-docs