Merge "Waiting for NORMAL state after removing work profile" into main