Merge "Add some strings for bubbles; update permission prompt string"