Merge "Fix incorrect width of right most action button in notification" into pi-dev