Merge "Add way to check if user has locked the bubble allowed field"