Merge "WakeupController: fix for STA+STA" into sc-dev