Merge "Replace FrameLayout by LinearLayout, remove a RelativeLayout."