Disable AOSP red border
some changes