Merge pull request #18113 from steveck-chung/bug-988772

Bug 988772 - [tarako][buri] sometimes contact index shows nothing when tap on a index. r=arcturus.
Merge pull request #18076 from comoyo/bug993367

Bug 993367 - Stop reflowing on updateTargetWindowHeight. r=RudyL