Merge "Adapted the measuring of notification content view" into nyc-dev