Merge "Support for Terms & Conditions notification"