Merge "Few improvements for Companion widget APIs"