Merge "Add targetSdk check around new LinearLayout weighted measure behavior" into pi-dev