Merge "Improvements on layout with default intent resolver" into rvc-dev