Merge "Move hybrid notification view inflation to the background thread" into main