Merge "Allow notification expansion to be toggleable."