Merge "Fix app_block_state broadcast" into tm-dev