Merge "CEC: Defer CEC actions until logical address is available" into nyc-dev