Merge "Update handling of incoming CEC power key presses"