Merge "Single finger notification expansion." into jb-dev