Merge "Fix for endless loop in RelativeLayout."