Merge pull request #12383 from crh0716/904345

Bug 904345 - Handle the case of the 'ready' state r=kaze(cherry picked from commit 9bebe761f816d210e98700784a04387722443dcb)