Merge "Add manage notifications screen" into pi-dev