Merge "Adjusted the lineHeight for notification texts" into pi-dev