Merge "Don't allow actions to intrude into the notification area." into jb-dev