Merge "[AsyncHybridViewInflation] Fix crash in Historic Message handling" into main