Merge "Add WindowLayoutAffinity attribute."