Merge "Update notification to allow multiline text" into pi-dev