Merge "Improve the handling of assoc rejection due to AP's reasons"