CONFIG_POWER_OPTIMIZATION_ENABLE=y and asset_tracker application on master branch

I cannot set CONFIG_POWER_OPTIMIZATION_ENABLE to yes in the master branch. It leads to deadlock in at_cmd_write() because that ends up getting executed in the socket_thread. Actually it triggers the ASSERT 

__ASSERT(k_current_get() != socket_tid,
"at_cmd deadlock: socket thread blocking self\n");

to prevent deadlock.

Will the lte_link_control code be updated to match those changes on master branch in at_cmd? Is there a time frame? My colleague Timothy received the suggestion to use the master branch due to problems getting modem_info, and I am following along that path.