Merge "CDD: Watch: SR to MUST for power consumption accounting" into pi-dev