Merge remote-tracking branch 'origin/master' into sheep_tinker_3.0.2

app/src/main/res/layout/title.xml

@@ -90,7 +90,8 @@
         android:background="@color/translate"
         android:gravity="center"
         android:minWidth="?attr/actionBarSize"
-        android:layout_toLeftOf="@+id/ibtn_baseactivity_right"
+        android:layout_alignParentEnd="true"
+        android:layout_marginEnd="?attr/actionBarSize"
         android:visibility="gone"/>
 
     <TextView