Merge "Restrict unsupported usage of Linear/RelativeLayout APIs"