Merge "Correctly apply android:theme attribute from <include> tag"