Merge "Changing InflatedMessage to use RelativeLayout instead of LinearLayout." into arc-apps